Merge "Trigger re-inflate when sensitive setting changes" into tm-dev