Merge "Move broadcast receiver for showing security dialog" into tm-dev